Changed to version 3
Changed to version 4
Merge branch 'newhotfix'

Conflicts:
	README.txt