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

Trivial merge