Merge branch 'MDL-67654-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 23:58:20 +0000 (07:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 23:58:20 +0000 (07:58 +0800)

Trivial merge