Transplanting changeset f3b0b5725c58 (Fix for bug 1301)
4b1cd219663fd693cc5195359ca8e88399fbb871 f0000000 562 Will's Global Signf6a38567f8797e7c3fea00edf5a158d27a1a8b55 00000000 602 Andy Thwateeeda2c6da84f17519ee837eadb8a5289dadfbb26 00000000 1119 David RSAdc77026daab6b02ef09fa14505edf9411fc177ec f0000000 1440 Mike Prevost