bugfix when changing the stream format
Merge branch 'master' into devel