Mirror cubeplusplus into C-only branch
Mirror cubeplusplus into C-only branch