back on master for c++11