Streams 55

Resolves STREAMS-55.  Wrote a test for it but misplaced it - will push that before closing issue.