Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6