Update README.md
Merge branch 'master' into build-split

Conflicts:
	README.md