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