Merge branch 'master' into issue316-multiline-lumberjack
Merge pull request #351 from cityindex/issue316-multiline-lumberjack

Handle multiline messages shipped from lumberjack
Merge branch 'master' into issue348-CSV_caret