Merge pull request #360 from pyr/feature-log-logstash