Catch integrity violations for duplicate channel numbers.
Merge remote-tracking branch 'origin/master'