Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:08:24 +0000 (11:08 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:08:24 +0000 (11:08 -0300)

Trivial merge