preparing for merge
Merge branch 'trunk' of https://github.com/w2ogroup/streams into trunk