Testing branch features
Merge branch 'master' into test

Conflicts:
	readme.txt