Conflicts because of urlhash fixes: classes/File.php classes/File_redirection.php classes/File_thumbnail.php