Merge branch 'MDL-70065_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:10:24 +0000 (10:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:10:24 +0000 (10:10 +0800)

Trivial merge