Adding additional metadata to output modules
Merge branch 'master' of github.com:Graylog2/graylog2-server