r3855: Sync up with the one in the main source dir (yes, this should probably