Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp