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