Merge branch 'MDL-65818-master' of https://github.com/sammarshallou/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 7 Dec 2020 03:26:32 +0000 (11:26 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 7 Dec 2020 03:26:32 +0000 (11:26 +0800)

Trivial merge