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