Merge branch 'MDL-70321_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:39:54 +0000 (11:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:39:54 +0000 (11:39 +0800)

Trivial merge