Merge branch 'MDL-68722-310' of https://github.com/matt-catalyst/moodle into MOODLE_3...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2020 06:03:15 +0000 (14:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2020 06:03:15 +0000 (14:03 +0800)

Trivial merge