Fix node 0.8 tests
Merge remote-tracking branch 'origin/master'