Auto-Merge pull request #2825 from rpv-tomsk/collectd-master