Merge branch 'MDL-51177-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 13 Sep 2018 08:17:02 +0000 (16:17 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 13 Sep 2018 08:17:02 +0000 (16:17 +0800)

Trivial merge