Merge branch 'MDL-70041-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 03:48:58 +0000 (11:48 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 03:48:58 +0000 (11:48 +0800)

Trivial merge