Merge branch 'MDL-57680' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 03:00:19 +0000 (11:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 03:00:19 +0000 (11:00 +0800)

Trivial merge