Merge pull request #1 from logstash/master

Update from upstream