Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	README

diff --cc README
index 5071617209c7a76d7779cc4a9cfed1972605b464,f9e49f0244e2cde56ab76290c1d106d0e87cd130..c5c2b7fa6b470c0d1b8bc1e89873a31831a68e89
--- 1/README
--- 2/README
+++ b/README
@@@ -50,10 -47,9 +47,13 @@@ Feature
      - cpufreq
        CPU frequency (For laptops with speed step or a similar technology)
  
+     - curl
+       Parse statistics from websites using regular expressions.
+ 
 +    - curl_json
 +      Retrieves JSON data via cURL and parses it according to user
 +      configuration.
 +
      - dbi
        Executes SQL statements on various databases and interprets the returned
        data.

diff --cc src/df.c
Simple merge