Merge branch 'MDL-69246' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:39:31 +0000 (10:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:39:31 +0000 (10:39 +0800)

Trivial merge