Merge branch 'MDL-63712-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 01:33:42 +0000 (09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 01:33:42 +0000 (09:33 +0800)

Trivial merge