Merge remote-tracking branch 'github/pr/1681'

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/tail.c
Simple merge

diff --cc src/tail_csv.c
Simple merge