Update
Merge branch '8.x-dev' into 8.x

Conflicts:
	README.md