am 8d7fad5e: Merge "Warn about changed behavior around \'+\' characters."

* commit '8d7fad5e677109b7338d5d605ad9e1177952a22f':
  Warn about changed behavior around '+' characters.