Merge branch 'MDL-68473-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Sun, 3 May 2020 11:59:46 +0000 (19:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Sun, 3 May 2020 11:59:46 +0000 (19:59 +0800)

Trivial merge