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