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