git ship [<branchname>]
Merge branch 'master' into cr-simplifyReadme

Conflicts:
	README.md