Merge pull request #6001 from ldir-EDB0/importminiupnpd