Merge pull request #2536 from waterson/test-channel-signer