Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 12:30:38 +0000 (13:30 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 12:30:38 +0000 (13:30 +0100)

Trivial merge