Choose OpenGL ES 1.1 or OpenGL ES 2.0?
Merge branch 'develop'