Merge pull request #892 from TheBlueMatt/2021-04-fix-htlc-ser