Commits

Merged additional changes from trunk, made a change to how script tests are invoked to see if it fixes a problem on SunOS.
Merged additional changes from trunk, made a change to how script tests are invoked to see if it fixes a problem on SunOS.