Streams 60

Resolves https://issues.apache.org/jira/browse/STREAMS-60