Merge branch 'MDL-70459-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:51:36 +0000 (16:51 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:51:36 +0000 (16:51 +0800)

Trivial merge