Bring in from L5 changes
Merge branch 'master' of github.com:anomalylabs/streams