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