Allowed escaping @channel.
ACTUALLY fixed the Unicode channel-saving issue... I think?
Merge remote-tracking branch 'upstream/master'