Merge branch 'wip-MDL-61629-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 07:58:26 +0000 (15:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 07:58:26 +0000 (15:58 +0800)

Trivial merge