Merge branch 'wip-MDL-55327-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:15:54 +0000 (11:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:15:54 +0000 (11:15 +0800)

Trivial merge