Merge branch 'MDL-70065' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 01:49:26 +0000 (09:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 01:49:26 +0000 (09:49 +0800)

Trivial merge