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