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