Merge branch 'MDL-70059-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2020 04:05:19 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2020 04:05:19 +0000 (12:05 +0800)

Trivial merge