Merge branch 'wip-mdl-55766' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 08:24:27 +0000 (09:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 08:24:27 +0000 (09:24 +0100)

Trivial merge