add UPnP friendly name
merge origin/master