Merge branch '310_MDL-68896' of git://github.com/danmarsden/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Nov 2020 01:33:06 +0000 (09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Nov 2020 01:33:06 +0000 (09:33 +0800)

Trivial merge