Merge branch 'MDL-69431-master' of git://github.com/watson8/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 12 Jan 2021 09:08:29 +0000 (17:08 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 12 Jan 2021 09:08:29 +0000 (17:08 +0800)

Trivial merge