Merge "opus: Support for > 2 channels"