This?
Merge branch 'master' of git://github.com/anomalylabs/streams-platform

Conflicts:
	composer.json