Merge pull request #276 from kdarbyshirebryant/upnpenabled