Merge branch 'MDL-69411-master' of git://github.com/dravek/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:36:26 +0000 (11:36 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:36:26 +0000 (11:36 +0800)

Trivial merge