Merge branch 'wip-MDL-56138-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 03:35:47 +0000 (11:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 03:35:47 +0000 (11:35 +0800)

Trivial merge