Merge pull request #180 from TheBlueMatt/2018-09-htlc-tx-unwrap-fix