Merge branch 'MDL-63664-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 02:42:48 +0000 (10:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 02:42:48 +0000 (10:42 +0800)

Trivial merge