Merge branch 'pull/collectd-4' into collectd-4

diff --combined configure.in
index 5d34652127a61ffb316aca28758fe4ac70f20dcb,36366756858377d067af56ad9134dfe5bd54ceac..5166ad16fc8652dfca2e1ba7f728c3dad42478c1
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Process this file with autoconf to produce a configure script.
- AC_INIT(collectd, 3.11.3)
+ AC_INIT(collectd, 4.0.0-rc0)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -453,9 -453,6 +453,9 @@@ if test "x$nan_type" = "xnone"; the
        [[
  #include <stdlib.h>
  #include <math.h>
 +#ifdef NAN
 +# undef NAN
 +#endif
  #define NAN (0.0 / 0.0)
  #ifndef isnan
  # define isnan(f) ((f) != (f))