Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/python.c
index 9d732772d9c77167fde1297df2886ef87e0d1ab5,110a8e024a4ea8bcdd25a76dd80892de3e40f6c3..c7524143424aecbb87fa3c037eabb9f8fee5016a
--- 1/src/python.c
--- 2/src/python.c
+++ b/src/python.c
@@@ -1063,7 -1017,8 +1063,7 @@@ PyMODINIT_FUNC PyInit_collectd(void) 
  }
  #endif
  
- static int cpy_init_python() {
+ static int cpy_init_python(void) {
 -      char *argv = "";
        PyObject *sys;
        PyObject *module;
  

diff --cc src/tokyotyrant.c
Simple merge