+ add custom timestamp field with milliseconds because fluentd use ts in seconds (for correct sorting)
Merge remote-tracking branch 'origin/master'