Merge "Add tags around string formatting placeholders."