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