Merge "Allow users to tag file uploads"