Merge branch 'MDL-63656-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Oct 2018 00:49:56 +0000 (08:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Oct 2018 00:49:56 +0000 (08:49 +0800)

Trivial merge