Merged the C++ portion of OpenGL from CM 10.1