Merge branch 'MDL-69149-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 03:57:04 +0000 (11:57 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 03:57:04 +0000 (11:57 +0800)

Trivial merge