Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 11:37:32 +0000 (12:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 11:37:32 +0000 (12:37 +0100)

Trivial merge