Merge "Warn about changed behavior around '+' characters."