Merge changes from the witness.


git-svn-id: http://nvidia-texture-tools.googlecode.com/svn/trunk@1394 95f4ed2b-212e-0410-8b90-d31948207fce