- update for LOGSTASH-1299
Merge git://github.com/logstash/logstash