Merge branch 'MDL-65493-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 11 Sep 2019 05:45:19 +0000 (13:45 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 11 Sep 2019 05:45:19 +0000 (13:45 +0800)

Trivial merge