Merge "GLESv1 extensions"