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