Merge branch 'MDL-69507_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 03:15:55 +0000 (11:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 03:15:55 +0000 (11:15 +0800)

Trivial merge