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