Commit on satyam7-win7 branch from satyam7-win7
Manual merge with origin