Merge "Change File::compare to use getName, not getTitle"