Merge "Replace wikitext bold and italics with <strong> and <em>"