Merge branch 'MDL-56223-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 5 Sep 2019 09:20:03 +0000 (17:20 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Sep 2019 09:20:03 +0000 (17:20 +0800)

Trivial merge