Merge branch 'MDL-69868-master' of git://github.com/ilya-catalyst/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 23:47:12 +0000 (07:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 23:47:12 +0000 (07:47 +0800)

Trivial merge