Electrum doge

merge upstream changes