Added the changes in the latest collectd package.