base

Merge change 22962 into eclair

* changes:
  Fix strings whose apostrophes were eaten because of the lack of a backslash.