Merge branch 'MDL-63167-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 Jul 2020 09:06:01 +0000 (17:06 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 Jul 2020 09:06:01 +0000 (17:06 +0800)

Trivial merge