Merge branch 'master' into make_txbuilder_take_ref_to_wallet

diff --cc CHANGELOG.md
Simple merge

diff --cc src/lib.rs
Simple merge

diff --cc src/wallet/mod.rs
index bece035e816961a8ec33845576909a70f2b53eae,cabb9b422ac40c94fcdcc3cf2add42403dcfd657..19dfff3cb9f7ab59fcb0e18338bfd2be6f3f791d
--- 1/src/wallet/mod.rs
--- 2/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@@ -57,9 -57,8 +57,9 @@@ pub(crate) mod utils
  pub use utils::IsDust;
  
  use address_validator::AddressValidator;
- use signer::{Signer, SignerId, SignerOrdering, SignersContainer};
 +use coin_selection::DefaultCoinSelectionAlgorithm;
 -use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxBuilderContext};
+ use signer::{Signer, SignerOrdering, SignersContainer};
 +use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxParams};
  use utils::{
      check_nlocktime, check_nsequence_rbf, descriptor_to_pk_ctx, After, Older, SecpCtx,
      DUST_LIMIT_SATOSHI,