Node checkin

Merge from master, and testing again.