Merge branch 'MDL-67800-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 6 May 2020 04:10:31 +0000 (12:10 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 6 May 2020 04:10:31 +0000 (12:10 +0800)

Trivial merge