LOGSTASH-1033
Merge pull request #452 from semiosis/LOGSTASH-1033

LOGSTASH-1033