Merge branch 'MDL-70327-310' of git://github.com/cescobedo/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:51:59 +0000 (11:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:51:59 +0000 (11:51 +0800)

Trivial merge