Merge branch 'MDL-69421-master' of git://github.com/noeldemartin/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 01:35:37 +0000 (09:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 01:35:37 +0000 (09:35 +0800)

Trivial merge