Some news :)
Merge origin/master

Conflicts:
	streams/pom.xml