Merge branch 'MDL-65284-master' of git://github.com/aanabit/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 17 Dec 2020 03:06:16 +0000 (11:06 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 17 Dec 2020 03:06:16 +0000 (11:06 +0800)

Trivial merge