Merge branch 'MDL-70151-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...
authorJake Dallimore <jake@moodle.com>
Wed, 9 Dec 2020 06:46:14 +0000 (14:46 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 9 Dec 2020 06:46:14 +0000 (14:46 +0800)

Trivial merge