Merge pull request #4148 from popcornmix/streamchannels