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