Merge branch 'wip-mdl-55415' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Sep 2016 10:39:16 +0000 (11:39 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Sep 2016 10:39:16 +0000 (11:39 +0100)

Trivial merge