pretty sure node.py will terminate correctly now
Merge remote-tracking branch 'upstream/master'