Merge branch 'pr/1649'

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/types.db
index 4f8d31c,d89d411..e3da48a
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -74,9 -73,8 +74,10 @@@ duration                seconds:GAUGE:0
  email_check             value:GAUGE:0:U
  email_count             value:GAUGE:0:U
  email_size              value:GAUGE:0:U
 +energy                  value:GAUGE:U:U
 +energy_wh               value:GAUGE:U:U
  entropy                 value:GAUGE:0:4294967295
+ errors                  value:DERIVE:0:U
  evicted_keys            value:DERIVE:0:U
  expired_keys            value:DERIVE:0:U
  fanspeed                value:GAUGE:0:U