am 294ce05e: Merge "Make string literal concatenation play nice with C++11."

* commit '294ce05e23a96353c8ddf934428bc60d1395b9a5':
  Make string literal concatenation play nice with C++11.