Merge branch 'MDL-69869-master' of git://github.com/ilya-catalyst/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:08:06 +0000 (11:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:08:06 +0000 (11:08 +0800)

Trivial merge