Merge PR#87 'sieverssj/STREAMS-174'
Auto-merge | Integrating changes from apache/master