c++11 minor
c++11 merge