Merge branch 'wip-MDL-61485-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:37:45 +0000 (09:37 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:37:45 +0000 (09:37 +0800)

Trivial merge