Merge branch 'MDL-70066-310' of git://github.com/lameze/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2020 02:01:18 +0000 (10:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2020 02:01:18 +0000 (10:01 +0800)

Trivial merge