Merged changes from branch "sput" r56:61 back into trunk.