Updating master with C++11 switch