Merge branch 'poller' of github.com:spesmilo/electrum-server into poller