Merge branch 'MDL-70059-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2020 04:03:49 +0000 (12:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2020 04:03:49 +0000 (12:03 +0800)

Trivial merge