Merge branch '6.3' into 6.4

* 6.3:
  Fix merge (bis)
  Fix merge

Author: nicolas-grekas

Tests/Mime/NotificationEmailTest.php

@@ -142,7 +142,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
         ], $email->getContext());
 
@@ -158,7 +158,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());
@@ -173,7 +173,7 @@ public function testContext()
             'action_url' => 'Action URL',
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());