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