Merge branch 'wip-MDL-53402-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 16:06:26 +0000 (17:06 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 16:06:26 +0000 (17:06 +0100)

Trivial merge