update from upstream

Merged Gampe Sebastian requested to merge tonyford/electrumfairchainsx:master into master

merge changes

Merge request reports