Merge branch 'MDL-70131-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 6 Nov 2020 01:27:33 +0000 (09:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 6 Nov 2020 01:27:33 +0000 (09:27 +0800)

Trivial merge