fix (or at least work around) #788
Merge branch 'master' of git://github.com/spesmilo/electrum
Merge pull request #789 from molecular/master

fix (or at least work around) #788