Commit from branch on satyam-w7
Merge branch 'branch-on-satyam-w7'

Conflicts:
	README.txt