am 2be288ff: Merge "Fix build after C++11 migration."