Update README.md
Merge branch 'master' into testing

Conflicts:
	README.md