Merge branch '5.4'

diff --cc wcfsetup/install/files/lib/system/WCFSetup.class.php
index 594d51233217a9ab71f3c5c2b6453b8e74e49c35,1c3ca4544d0850f074db97f3a00267f317ce13cf..f8b2525c25a4b5b90cc87cb819f8a6217d2f00c9
--- 1/wcfsetup/install/files/lib/system/WCFSetup.class.php
--- 2/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@@ -36,8 -36,9 +36,8 @@@ use wcf\util\XML
  
  // define
  \define('PACKAGE_ID', 0);
- \define('HTTP_SEND_X_FRAME_OPTIONS', 0);
+ \define('HTTP_SEND_X_FRAME_OPTIONS', 1);
  \define('CACHE_SOURCE_TYPE', 'disk');
 -\define('MODULE_MASTER_PASSWORD', 1);
  \define('ENABLE_DEBUG_MODE', 1);
  \define('ENABLE_BENCHMARK', 0);
  \define('ENABLE_ENTERPRISE_MODE', 0);

diff --cc wcfsetup/install/lang/de.xml
Simple merge