Update README.md
Merge branch 'master' into link-override

Conflicts:
	README.md