Merge "More C++11 compatibility."