Merge "Avoid Database::tableName in WikiExporter"