Merge C++11 changes.