fix fatal error when deleting a channel with no conversations in it
Merge branch 'develop'