Merge branch 'MDL-63668-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:29:29 +0000 (11:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:29:29 +0000 (11:29 +0800)

Trivial merge