Merge branch 'MDL-69232-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 10 Jul 2020 07:12:44 +0000 (15:12 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 10 Jul 2020 07:12:44 +0000 (15:12 +0800)

Trivial merge