Merge branch 'master' into next

diff --cc wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
index 1b465a587605b6995e2a696c22ca6b5657a7dd38,215b5d99b98c4e55ccaa12f08930d830c9a491d3..75fce009051276f8e0cb007887af82f66f8dba69
--- 1/wcfsetup/install/files/lib/form/RegisterForm.class.php
--- 2/wcfsetup/install/files/lib/form/RegisterForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@@ -447,7 -427,7 +447,8 @@@ class RegisterForm extends UserAddForm 
                                'username' => $this->username,
                                'email' => $this->email,
                                'password' => $this->password,
 +                              'blacklistMatches' => (!empty($this->blacklistMatches)) ? JSON::encode($this->blacklistMatches) : '',
+                               'signatureEnableHtml' => 1,
                        ]),
                        'groups' => $this->groupIDs,
                        'languageIDs' => $this->visibleLanguages,