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