Merged changes from branch "sput" r62:66 back into trunk.