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

Trivial merge