Add support for Type_NodeEvent
Merge remote-tracking branch 'paulj/master'