REV-4 some commit after 3
Merge branch 'master' into feature2

Conflicts:
	README.md
Merge branch 'feature2'