Merge pull request #4562 from Ansuel/upnp-stun