Merge branch 'wip-mdl-49150' of https://github.com/rajeshtaneja/moodle