Patches from bugs 11644, 11722.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api@25406 e7fa87d3-cd2b-0410-9028-fcbf551c1848
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api@25407 e7fa87d3-cd2b-0410-9028-fcbf551c1848