Merge branch 'MDL-65134-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 May 2019 02:05:26 +0000 (10:05 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 May 2019 02:05:26 +0000 (10:05 +0800)

Trivial merge