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