merge in c++11 changes