Merge branch 'MDL-69964-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 02:22:38 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 02:22:38 +0000 (10:22 +0800)

Trivial merge