Merge branch 'wip-mdl-53601' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 13:42:44 +0000 (14:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 13:42:44 +0000 (14:42 +0100)

Trivial merge