Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_...