Merge branch 'wip-mdl-55380' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:38:34 +0000 (11:38 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:38:34 +0000 (11:38 +0100)

Trivial merge