Merge branch 'MDL-67373-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Dec 2019 00:39:28 +0000 (08:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Dec 2019 00:39:28 +0000 (08:39 +0800)

Trivial merge