Merge branch 'MDL-64337-master-fix1' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 7 Feb 2019 06:59:45 +0000 (14:59 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 7 Feb 2019 06:59:45 +0000 (14:59 +0800)

Trivial merge