Merge pull request #2693 from Evanfeenstra/next-hop-pubkey-secp-mode