fix #661
Merge branch 'master' of git://github.com/spesmilo/electrum