Merge branch 'wip-mdl-58261-m' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:51:30 +0000 (13:51 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:51:30 +0000 (13:51 +0000)

Trivial merge