Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)

Trivial merge