Merge remote-tracking branch 'origin/pr/691'

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

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

diff --cc src/configfile.c
index 9a5807ce07f210b670ea732ddca7c5a355eafb7a,2eaaad1af4bbcae01e795cfbb478b3838c50b579..9841efdacf0acc4ce929ddf0a3eb07834c270c2f
--- 1/src/configfile.c
--- 2/src/configfile.c
+++ b/src/configfile.c
@@@ -117,9 -117,9 +117,10 @@@ static cf_global_option_t cf_global_opt
        {"WriteQueueLimitLow", NULL, NULL},
        {"Timeout",     NULL, "2"},
        {"AutoLoadPlugin", NULL, "false"},
+       {"CollectInternalStats", NULL, "false"},
        {"PreCacheChain",  NULL, "PreCache"},
 -      {"PostCacheChain", NULL, "PostCache"}
 +      {"PostCacheChain", NULL, "PostCache"},
 +      {"MaxReadInterval", NULL, "86400"}
  };
  static int cf_global_options_num = STATIC_ARRAY_SIZE (cf_global_options);
  

diff --cc src/plugin.c
Simple merge