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

Conflicts:
	README.md