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