am 7d831871: Make string literal concatenation play nice with C++11.

* commit '7d831871032675e252490b52ddbb29a63e5497bf':
  Make string literal concatenation play nice with C++11.