Merge branch 'MDL-61578-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 08:45:55 +0000 (16:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 08:45:55 +0000 (16:45 +0800)

Trivial merge