Merge branch 'wip-mdl-42395' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Feb 2016 08:18:06 +0000 (08:18 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Feb 2016 08:18:06 +0000 (08:18 +0000)

Trivial merge