merge of opengl into master