Merge branch 'MDL-69156_310' of https://github.com/ffhs/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:52:07 +0000 (11:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:52:07 +0000 (11:52 +0800)

Trivial merge