Merge branch 'wip-MDL-55366-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:44:09 +0000 (11:44 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:44:09 +0000 (11:44 +0100)

Trivial merge