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