Merge branch 'restore_old_miniupnp_compat' into 0.4.x