Merge branch 'MDL-70320' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:56:05 +0000 (11:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:56:05 +0000 (11:56 +0800)

Trivial merge