Merge branch 'wip-MDL-60415-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jan 2018 06:30:34 +0000 (14:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Jan 2018 06:30:34 +0000 (14:30 +0800)

Trivial merge