Merge branch 'MDL-69809-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 02:47:46 +0000 (10:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 02:47:46 +0000 (10:47 +0800)

Trivial merge