Merged in changes from the tip of RCL_1 branch which includes fixes for Bug 284, Bug 383, Bug 287. These were wiped out from when the S^3 code drop came in.
4b1cd219663fd693cc5195359ca8e88399fbb871 C0000000 562 Will's Global Sign
f6a38567f8797e7c3fea00edf5a158d27a1a8b55 80000000 602 Andy Thwate
eeda2c6da84f17519ee837eadb8a5289dadfbb26 80000000 1119 David RSA