Merge branch 'collectd-4.8'

Conflicts:
	src/df.c

diff --cc README
Simple merge

diff --cc src/df.c
index 54f70ef,462e1c6..0cc782a
--- 1/src/df.c
--- 2/src/df.c
+++ b/src/df.c
@@@ -137,7 -136,7 +137,7 @@@ static void df_submit (char *df_name
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
        sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-       sstrncpy (vl.type, type, sizeof (vl.host));
 -      sstrncpy (vl.type, "df", sizeof (vl.type));
++      sstrncpy (vl.type, type, sizeof (vl.type));
        sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
  
        plugin_dispatch_values (&vl);