Prepare 2.0.1/2.1.1 releases
Merge branch '2.0'

Conflicts:
	composer.json