Merge C++11 related changes.