Merge branch 'MDL-69507' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 03:11:07 +0000 (11:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 03:11:07 +0000 (11:11 +0800)

Trivial merge