Merge pull request #662 from lightning-signer/compat5