Merge pull request #5093 from wigyori/for-15.05-libupnpp