Merge branch 'MDL-70126-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:25:04 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:25:04 +0000 (10:25 +0800)

Trivial merge