Merge branch 'release/0.10.0'

Conflicts:
	composer.json
	composer.lock