Merge in 5.32

diff --cc composer.json
Simple merge

diff --cc composer.lock
index 0d077a8513f6131e3fcf0e686d4f9eb6868c8815,9ae28e0666db50d0c8b9f505d9d435eed1549771..5f9e7064a070cfc754e5add0fd6ac2a983ae9cb7
--- 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": "0a477e3a819cc7555e2993da4e8e1754",
 -    "content-hash": "20c9c6b1d5bb65490586559ff73c296b",
++    "content-hash": "f32350338fcd33fb89de9bcea7a49125",
      "packages": [
          {
              "name": "adrienrn/php-mimetyper",