Merge branch 'wip-MDL-61663-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:45:50 +0000 (11:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:45:50 +0000 (11:45 +0800)

Trivial merge