Merge branch 'MDL-65426_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 07:38:44 +0000 (15:38 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 07:38:44 +0000 (15:38 +0800)

Trivial merge