[Milhouse]

I'll probably include that PR in these test builds (and stop the other wipupnp builds, although may still need a Generic build) once the initial issues are resolved - just one or two left.

My concern however is that this PR increases the risk of build failure as the rest of the code base changes over time, ie. introduction of other unrelated videodb fixes, and this PR in a nightly could become a headache for both myself and @Montellese as it may require frequent rebasing which wouldn't otherwise be necessary.