Merge PR#86 from 'robdouglas/STREAMS-176'
Auto-merge | Integrating changes from apache/master