Merge branch 'master' into 2.x

Conflicts:
	README.md