fix logging delim for splunk
Merge branch 'master' into setimmediate