Merge branch 'MDL-63254' of https://github.com/Chocolate-lightning/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 04:22:17 +0000 (12:22 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 04:22:17 +0000 (12:22 +0800)

Trivial merge