Merge pull request #281 from ariard/harden-inbound-htlc-resolved