Merge pull request #2979 from rpv-tomsk/collectd-master