Merge branch 'MDL-70326-MOODLE_310_STABLE' of https://github.com/durzo/moodle into...
authorJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:54:18 +0000 (11:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:54:18 +0000 (11:54 +0800)

Trivial merge