Merge pull request #12954 from neheb/upnp2