Merge branch 'MDL-70041-310' of git://github.com/mihailges/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 03:49:20 +0000 (11:49 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 03:49:20 +0000 (11:49 +0800)

Trivial merge