Merge branch 'MDL-65772-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jul 2019 00:44:48 +0000 (08:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jul 2019 00:44:48 +0000 (08:44 +0800)

Trivial merge