Merge pull request #3473 from Ansuel/upnp-con