Merge pull request #1933 from Ansuel/hostname_upnp