Merge branch 'MDL-70126' of git://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:20:00 +0000 (10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Nov 2020 02:20:00 +0000 (10:20 +0800)

Trivial merge