Merge "Replace <i> and <b> by <em> and <strong> in i18n"