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