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