fixes
Merge branch 'master' of github.com:spesmilo/electrum-server