Merge branch 'MDL-70073-310' of git://github.com/peterRd/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Mon, 2 Nov 2020 05:57:35 +0000 (13:57 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 2 Nov 2020 05:57:35 +0000 (13:57 +0800)

Trivial merge