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