Merge commit 'refs/merge-requests/1' of git://gitorious.org/electrum/electrum into...