changes rolled up for node 0.10.0
Merge some fixes.