Moved work to develop/feature/c++11 branch