Merge branch 'develop' into staging

* develop:
  again
  fix typo

public/typo3conf/LocalConfiguration.php

@@ -161,6 +161,6 @@ return [
         'systemMaintainers' => [
             1,
         ],
-        'trustedHostsPattern' => '(.*\.meramo|.*\.abi)\.de',
+        'trustedHostsPattern' => '(.*\.meramo\.org|.*\.abi\.de)',
     ],
 ];