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

Trivial merge