Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
index 7e190d208ead4dcf4c9b985e53ea2574c09c7a47,c70937df671aaa036ecdec2921a690b0b8754c42..eff4a7a9ad342ceabdae16b29f5a46941247646a
--- 1/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
--- 2/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
@@@ -2,7 -2,7 +2,8 @@@
  namespace wcf\data\user\trophy;
  use wcf\data\user\UserAction;
  use wcf\data\AbstractDatabaseObjectAction;
+ use wcf\data\user\UserProfile;
 +use wcf\data\user\UserProfileAction;
  use wcf\system\cache\runtime\UserProfileRuntimeCache;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\IllegalLinkException;