Merge branch 'MDL-61761-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 05:17:53 +0000 (13:17 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 05:17:53 +0000 (13:17 +0800)

Trivial merge