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