So, it's obviously too late to merge these for the 1.5 release. But I'm sending them so that they're out there and with any luck we can merge them early in the 1.6 cycle.
These patches have been baking in my internal tree for a while, and seem to be pretty solid.
