Merge branch 'wip-mdl-53571' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Apr 2016 07:42:27 +0000 (08:42 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Apr 2016 07:42:27 +0000 (08:42 +0100)

Trivial merge