upnp test
Merge branch 'master' of github.com-obscure:ethereum/go-ethereum