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

@robdouglas