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