Merge of 7c1ea0a, master.
Handle channel join errors such as a ban on the channel.