Merge "C++11 compatibility."