r25446: Merge some changes I made on the way home from SFO: