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