Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)

Trivial merge