Merge "Skip MailAddressTest::testNewFromUser on windows"