Merge branch 'MDL-62707' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 00:51:53 +0000 (08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Dec 2020 00:51:53 +0000 (08:51 +0800)

Trivial merge