Merge "Remove presentational HTML tags in favour of <code>, <samp> and <strong>."