Merge branch 'MDL-64723-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Wed, 28 Oct 2020 04:10:47 +0000 (12:10 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 28 Oct 2020 04:10:47 +0000 (12:10 +0800)

Trivial merge