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