Merge branch 'MDL-64283-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 6 Dec 2018 06:58:01 +0000 (14:58 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 6 Dec 2018 06:58:01 +0000 (14:58 +0800)

Trivial merge