.
Merge git://github.com/logstash/logstash