Merged branch 'master' into experimental.

diff --cc debian/collectd.conf
index 9b6acea671c57ddd8e9f43ad8073f12276a097b6,210eb042d312476d20093a3a29fff9b550df0667..a422f4079d63729e7aeae7ba5a32447fa2c71c93
--- 1/debian/collectd.conf
--- 2/debian/collectd.conf
+++ b/debian/collectd.conf
@@@ -513,14 -444,32 +514,34 @@@ LoadPlugin user
  #</Plugin>
  
  #<Plugin memcached>
 -#     Socket "/var/run/memcached.sock"
 +#     <Instance "local">
 +#             Socket "/var/run/memcached.sock"
  # or:
 -#     Host "127.0.0.1"
 -#     Port "11211"
 +#             Host "127.0.0.1"
 +#             Port "11211"
 +#     </Instance>
  #</Plugin>
  
+ #<Plugin modbus>
+ #     <Data "data_name">
+ #             RegisterBase 1234
+ #             RegisterType float
+ #             Type gauge
+ #             Instance "..."
+ #     </Data>
+ #
+ #     <Host "name">
+ #             Address "addr"
+ #             Port "1234"
+ #             Interval 60
+ #
+ #             <Slave 1>
+ #                     Instance "foobar" # optional
+ #                     Collect "data_name"
+ #             </Slave>
+ #     </Host>
+ #</Plugin>
+ 
  #<Plugin mysql>
  #     <Database db_name>
  #             Host "database.serv.er"