Merge "Remove double emphasis in strings"