Merge branch 'MDL-62046-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 02:26:41 +0000 (10:26 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 02:26:41 +0000 (10:26 +0800)

Trivial merge