Merge branch 'MDL-68051-master-2' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Apr 2020 02:25:04 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Apr 2020 02:25:04 +0000 (10:25 +0800)

Trivial merge