Merge branch 'MDL-69192-310' of https://github.com/willob99/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2020 05:18:41 +0000 (13:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2020 05:18:41 +0000 (13:18 +0800)

Trivial merge