Merge branch 'MDL-63816-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:00:32 +0000 (08:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:00:32 +0000 (08:00 +0800)

Trivial merge