Merge branch 'MDL-70320-master' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 10 Dec 2020 00:12:10 +0000 (08:12 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 Dec 2020 03:56:40 +0000 (11:56 +0800)

Trivial merge