Merge branch 'vo_gl3'