Merge branch '2.3' into 2

src/TestSessionHTTPMiddleware.php

@@ -69,6 +69,7 @@ class TestSessionHTTPMiddleware implements HTTPMiddleware
             $mailer = $testState->mailer;
             Injector::inst()->registerService(new $mailer(), Mailer::class);
             Email::config()->set("send_all_emails_to", null);
+            Email::config()->update('admin_email', 'no-reply@example.com');
         }
 
         // Connect to the test session database