Merge branch 'wip-MDL-61163-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 02:36:57 +0000 (10:36 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 02:36:57 +0000 (10:36 +0800)

Trivial merge