Merge branch 'wip-MDL-61127-master' of git://github.com/abgreeve/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 3 Apr 2018 09:34:03 +0000 (17:34 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 3 Apr 2018 09:34:03 +0000 (17:34 +0800)

Trivial merge