Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	wcfsetup/install/files/lib/page/AbstractArticlePage.class.php

diff --cc wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
index b7a62d2ddfe69288078bedd9633655e4631956ad,ea9afa430ad4adc47404009ba61fc6d7a0abbec5..cb73d2f0332157a9771f7e43f884c96e90a9498c
--- 1/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
--- 2/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
@@@ -1,11 -1,9 +1,11 @@@
  <?php
  namespace wcf\page;
- use wcf\data\article\AccessibleArticleList;
 +use wcf\data\article\category\ArticleCategory;
  use wcf\data\article\content\ViewableArticleContent;
+ use wcf\data\article\AccessibleArticleList;
  use wcf\data\article\ArticleEditor;
  use wcf\data\article\ViewableArticle;
 +use wcf\data\tag\Tag;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\IllegalLinkException;
  use wcf\system\exception\PermissionDeniedException;

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

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