Merge branch 'MDL-62807-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 05:48:15 +0000 (13:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 05:48:15 +0000 (13:48 +0800)

Trivial merge