Merge branch 'Wshadow' into collectd-5.4