Merge branch 'MDL-62030-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:51:39 +0000 (09:51 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:51:39 +0000 (09:51 +0800)

Trivial merge