Merge branch 'sh/perl' into collectd-4