Merge branch 'MDL-70320_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 04:06:22 +0000 (12:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 04:06:22 +0000 (12:06 +0800)

Trivial merge