Merge branch 'wip-mdl-55749' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 07:43:52 +0000 (08:43 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 07:43:52 +0000 (08:43 +0100)

Trivial merge