Merge "Fix C++11 build."