Merge remote-tracking branch 'github/pr/1124'

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
index 8cf6ca9,7877228..1f4ccf8
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -138,8 -138,8 +138,9 @@@
  #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
  #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
  @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
 +#@BUILD_PLUGIN_MIC_TRUE@LoadPlugin mic
  #@BUILD_PLUGIN_MODBUS_TRUE@LoadPlugin modbus
+ #@BUILD_PLUGIN_MQTT_TRUE@LoadPlugin mqtt
  #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter
  #@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
  #@BUILD_PLUGIN_NETAPP_TRUE@LoadPlugin netapp

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