Merge branch 'MDL-67514-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorJake Dallimore <jake@moodle.com>
Wed, 2 Dec 2020 08:23:54 +0000 (16:23 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 2 Dec 2020 08:23:54 +0000 (16:23 +0800)

Trivial merge