Merge branch 'MDL-68821' of https://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 03:14:00 +0000 (11:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 03:14:00 +0000 (11:14 +0800)

Trivial merge