Merge branch 'master' into master

diff --cc Makefile.am
Simple merge

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

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

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

diff --cc src/types.db
index 82b284d46f13d85a089109545b93f9a5a04ca16a,aa1ebf803b8aab8252e75cb9a780171af59f772b..17d7de2420abcea8ff00842b5f02cfd593bf78d1
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -135,7 -139,7 +140,8 @@@ job_stats               value:DERIVE:0:
  latency                 value:GAUGE:0:U
  links                   value:GAUGE:0:U
  load                    shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
 +max_ec                  value:COUNTER:0:U
+ media                   value:GAUGE:0:18446744073709551615
  memory_bandwidth        value:DERIVE:0:U
  md_disks                value:GAUGE:0:U
  memcached_command       value:DERIVE:0:U