Merge branch 'wip-MDL-61308-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 01:15:25 +0000 (09:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 01:15:25 +0000 (09:15 +0800)

Trivial merge