Merge pull request #980 from NvrBst/pull-request-upnp_description