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

Trivial merge