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

Trivial merge