update from upstream

Gampe Sebastianrequested to merge
tonyford/electrumfairchainsx:master into master

merge changes

Merge request reports

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net