Merge pull request #2578 from castillofrancodamian/upnp