Merge branch 'MDL-67518' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 01:14:00 +0000 (09:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 01:14:00 +0000 (09:14 +0800)

Trivial merge