Merge "Proper namespace handling for WikiImporter"