Merge branch '3M3RY-mainline_bitcoind'