Merged branch upnpx-1.2.5

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>