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