Merge branch 'wip-MDL-61477-master-manager' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 15 Mar 2018 03:38:14 +0000 (11:38 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 15 Mar 2018 03:38:14 +0000 (11:38 +0800)

Trivial merge