Applied PR#32 from  'robdouglas/STREAMS-103'
Merge remote-tracking branch 'apache/master'