Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle