Now depend on dev-master
Merge branch 'refs/heads/release'

Conflicts:
	composer.json
Merge branch 'refs/heads/master' into release