Merge branch 'MDL-63811' of git://github.com/aolley/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 09:09:28 +0000 (17:09 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 09:09:28 +0000 (17:09 +0800)

Trivial merge