Merge "Expand templates: Change 'text' to 'wikitext'"