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