Merge "Removed clearSharedCache() hack in User.php"