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

Conflicts:
	README.md