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