Merge pull request #20594 from stintel/miniupnpd