out is now a stream (more flexible)
Merge remote-tracking branch 'origin/master'