Merge pull request #8235 from mhei/fix-libupnp