Merge branch 'MDL-55449-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 03:44:38 +0000 (11:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 03:44:38 +0000 (11:44 +0800)

Trivial merge