Merge "Global C++11 compatibility."