Merge branch 'collectd-4.10'

diff --combined src/Makefile.am
index d4aaac7,2a32ece..8c1f8ba
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -853,6 -853,10 +853,10 @@@ if BUILD_PLUGIN_PYTHO
  pkglib_LTLIBRARIES += python.la
  python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h
  python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS)
+ python_la_CFLAGS = $(AM_CFLAGS)
+ if COMPILER_IS_GCC
+ python_la_CFLAGS += -fno-strict-aliasing -Wno-strict-aliasing
+ endif
  python_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_PYTHON_LDFLAGS)
  python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS)
  collectd_LDADD += "-dlopen" python.la
@@@ -1036,14 -1040,6 +1040,14 @@@ collectd_LDADD += "-dlopen" target_set.
  collectd_DEPENDENCIES += target_set.la
  endif
  
 +if BUILD_PLUGIN_TARGET_V5UPGRADE
 +pkglib_LTLIBRARIES += target_v5upgrade.la
 +target_v5upgrade_la_SOURCES = target_v5upgrade.c
 +target_v5upgrade_la_LDFLAGS = -module -avoid-version
 +collectd_LDADD += "-dlopen" target_v5upgrade.la
 +collectd_DEPENDENCIES += target_v5upgrade.la
 +endif
 +
  if BUILD_PLUGIN_TCPCONNS
  pkglib_LTLIBRARIES += tcpconns.la
  tcpconns_la_SOURCES = tcpconns.c