Merge branch 'MDL-70324-3.10' of https://github.com/JBThong/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Mon, 14 Dec 2020 03:30:16 +0000 (11:30 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 Dec 2020 03:30:16 +0000 (11:30 +0800)

Trivial merge