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