Merge branch 'master' into 2.0

Conflicts:
	README.md