Merge pull request #2428 from waterson/create-channel-after-accept