Merge branch 'wip-mdl-55476' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Feb 2017 08:40:07 +0000 (08:40 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Feb 2017 08:40:07 +0000 (08:40 +0000)

Trivial merge