Merge branch 'master' into password-security

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
index e0037324631944a91b963cf88f246f79f2162f39,642e2bc3614d30bd323c6de64d984589f8cbee0d..6dd9ba7f18e199756e1164124b65b4db1d483bcc
--- 1/wcfsetup/install/files/lib/system/WCF.class.php
--- 2/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@@ -376,13 -376,9 +376,17 @@@ class WCF 
                // https://github.com/WoltLab/WCF/issues/3330
                define('MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING', 1);
                
 +              // Password strength configuration is deprecated since 5.3.
 +              define('REGISTER_ENABLE_PASSWORD_SECURITY_CHECK', 0);
 +              define('REGISTER_PASSWORD_MIN_LENGTH', 0);
 +              define('REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE', 8);
 +              define('REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE', 0);
 +              define('REGISTER_PASSWORD_MUST_CONTAIN_DIGIT', 0);
 +              define('REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR', 0);
++
+               // rel=nofollow is always applied to external link since 5.3
+               // https://github.com/WoltLab/WCF/issues/3339
+               define('EXTERNAL_LINK_REL_NOFOLLOW', 1);
                
                $filename = WCF_DIR.'options.inc.php';
                

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

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