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