Merge branch 'master' of github.com:KhronosGroup/OpenGL-Registry

Conflicts:
	extensions/esext.php