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

Trivial merge