Merge pull request #1361 from luizParreira/rust-lightning/issues/1280