Readme update [skip ci]
Merge branch 'master' into update.readme

Conflicts:
	README.md
Update README.md

[skip ci]