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