Merge pull request #1321 from tpikonen/channel-title-edit