Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...