Merge branch 'MDL-65792-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 28 Oct 2020 03:59:44 +0000 (11:59 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 28 Oct 2020 03:59:44 +0000 (11:59 +0800)

Trivial merge