Merge branch 'MDL-67317' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 17 Apr 2020 10:35:10 +0000 (18:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 17 Apr 2020 10:35:10 +0000 (18:35 +0800)

Trivial merge