Merge branch '2.1'

# Conflicts:
#	com.woltlab.wcf/package.xml
#	wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
#	wcfsetup/install/files/lib/system/WCF.class.php

diff --cc wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
index f467f0043bfebb9f0b926544791f916529d5db5f,a23736ab061760e93be9c4840087ede8d518cc57..b2bdd5daefa877f88c77707b97a384d6f1a9da7e
--- 1/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
--- 2/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
@@@ -8,7 -7,9 +8,8 @@@ use wcf\system\comment\CommentHandler
  use wcf\system\event\EventHandler;
  use wcf\system\exception\IllegalLinkException;
  use wcf\system\exception\PermissionDeniedException;
 -use wcf\system\request\LinkHandler;
 -use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
+ use wcf\system\moderation\queue\ModerationQueueManager;
 +use wcf\system\page\PageLocationManager;
  use wcf\system\WCF;
  
  /**