Merge branch 'master' into opengl-es-v2