https://github.com/bitcoin/bitcoin/pull/10712/commits
Reverted because rpc_fundrawtransaction was failing. Will fix then re-diff.