Merge branch 'MDL-63004' of https://github.com/Chocolate-lightning/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 6 Jul 2020 03:55:12 +0000 (11:55 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 6 Jul 2020 03:55:12 +0000 (11:55 +0800)

Trivial merge