Merge branch 'MDL-65856' of https://github.com/hdagheda/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2020 01:38:01 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2020 01:38:01 +0000 (09:38 +0800)

Trivial merge