Merge pull request #694 from luke-jr/restore_old_miniupnp_compat