Merge "Make TranslatingCursor deal with dupe column names"