Merge pull request #2478 from waterson/settle-htlcs