Merged changes from branch "sput" r50:55 back into trunk.