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