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