Import registry from SVN 26622
Merge branch 'khronos-registry'