Back to c++0x for compatibility with older versions of g++