Merge branch 'master' into form-link-to-created-item

diff --cc wcfsetup/install/files/acp/templates/styleAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index 5801a6e51cbe8760a485d32c8dd791599be5bd72,ec992126f14c1c17cdd6ea96078a72c634118483..766b17681ec41893d99ad2ecf6070043b4e443ec
--- 1/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
--- 2/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@@ -15,7 -15,7 +15,8 @@@ use wcf\system\file\upload\UploadHandle
  use wcf\system\image\ImageHandler;
  use wcf\system\language\I18nHandler;
  use wcf\system\Regex;
 +use wcf\system\request\LinkHandler;
+ use wcf\system\style\StyleCompiler;
  use wcf\system\style\exception\FontDownloadFailed;
  use wcf\system\style\FontManager;
  use wcf\system\WCF;

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

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