Merge branch 'MDL-68714-master' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 Jul 2020 03:58:17 +0000 (11:58 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 Jul 2020 03:58:17 +0000 (11:58 +0800)

Trivial merge