Merge branch 'wip-mdl-42281' of git://github.com/rajeshtaneja/moodle