Update README for new release
Merge branch 'master' into 8.4-master

Conflicts:
	README