Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/data/like/LikeAction.class.php
index cc3923a146b5fda46008356afe442c1a1091441b,7b28d4f73695f1abcee4ae21ec6bbf9b135b5b14..f230973d397e40f7387f6bec5b646b831bfe5fb1
--- 1/wcfsetup/install/files/lib/data/like/LikeAction.class.php
--- 2/wcfsetup/install/files/lib/data/like/LikeAction.class.php
+++ b/wcfsetup/install/files/lib/data/like/LikeAction.class.php
@@@ -1,8 -1,13 +1,10 @@@
  <?php
  namespace wcf\data\like;
 -use wcf\data\like\object\LikeObjectEditor;
 -use wcf\data\object\type\ObjectTypeCache;
 -use wcf\data\user\User;
 -use wcf\data\user\UserEditor;
 +use wcf\data\reaction\ReactionAction;
  use wcf\data\AbstractDatabaseObjectAction;
  use wcf\data\IGroupedUserListAction;
+ use wcf\system\cache\runtime\UserProfileRuntimeCache;
+ use wcf\system\exception\IllegalLinkException;
  use wcf\system\exception\PermissionDeniedException;
  use wcf\system\exception\UserInputException;
  use wcf\system\like\LikeHandler;

diff --cc wcfsetup/install/files/lib/data/user/User.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItemAction.class.php
Simple merge