Merge pull request #9601 from TDT-AG/pr/20190730-collectd