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