Merge pull request #464 from TheBlueMatt/upnp1.6