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