Import of v0.0.69
Merge tag 'UPnP_v0-0-69'