Merge pull request #2617 from castillofrancodamian/upnp