t/22, correct argument order for is_deeply
avoid test errors on Windows test servers w/o DNS
Merge branch 'upstream'