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