Merge branch 'MDL-69136-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 6 Jul 2020 02:44:10 +0000 (10:44 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 6 Jul 2020 02:44:10 +0000 (10:44 +0800)

Trivial merge