Merge branch 'wip-MDL-57649-master-fix2' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:22:25 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:22:25 +0000 (10:22 +0800)

Trivial merge