Merge branch 'MDL-70293' of git://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:28:41 +0000 (11:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 03:28:41 +0000 (11:28 +0800)

Trivial merge