Merge branch 'wip-MDL-61814-master-fix' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 May 2018 02:48:47 +0000 (10:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 May 2018 02:48:47 +0000 (10:48 +0800)

Trivial merge