Upnp fixes #2527

Merged
merged 2 commits into from Apr 2, 2013