- actually merge. I am so bad at code sometimes.
- update changelog
Merge git://github.com/logstash/logstash