Electrum doge - merge upstream changes

merge upstream changes