Merge in 5.41

diff --cc composer.json
Simple merge

diff --cc composer.lock
index 2648ad73f3e7c50cfa76b9e82305300305991d05,cbeb21f09ae3cf91e15f62b4f893fcc6330f7bac..9c00d15a1817d1ac3677b685ff2f5e237dca2e4d
--- 1/composer.lock
--- 2/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "127a1f748210d2bbea50645b5c0b2663",
 -    "content-hash": "aceccd69415b5fd67668ed7c0c870c39",
++    "content-hash": "96460a970b8f56a147890c6704c01d60",
      "packages": [
          {
              "name": "adrienrn/php-mimetyper",