Merge branch 'MDL-67594-master-2' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jul 2020 01:32:20 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jul 2020 01:32:20 +0000 (09:32 +0800)

Trivial merge