Merge branch 'MDL-70285_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Tue, 8 Dec 2020 08:33:43 +0000 (16:33 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 8 Dec 2020 08:33:43 +0000 (16:33 +0800)

Trivial merge