Prepare 2.0.2/2.1.2 releases
Merge branch '2.0'

Conflicts:
	composer.json