Switch to C++11