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

Trivial merge