Fix merging from bpaquet/node-logstash