am 3fd34002: Merge commit \'78be0498\' into manualmerge

* commit '3fd340028fc24198edb23ddf5eb5a0a100bab745':
  Fix issues that will be present in C++11