Merge branch 'master' of https://github.com/rust-bitcoin/rust-lightning into new...