Merge branch 'MDL-65936' of git://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jul 2019 05:29:42 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jul 2019 05:29:42 +0000 (13:29 +0800)

Trivial merge