Merge branch 'wip-mdl-51424' of https://github.com/dthies/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 19:33:28 +0000 (20:33 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 19:33:28 +0000 (20:33 +0100)

Trivial merge