Merge branch 'MDL-70459-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:50:41 +0000 (16:50 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:50:41 +0000 (16:50 +0800)

Trivial merge