Merge branch 'PHP-7.0' into PHP-7.1

diff --cc ext/date/config.w32
Simple merge

diff --cc ext/date/php_date.c
index d378d47be57b12a3a4bbe471c01028864d54b64f,00722d3c8e2399e7566204ed9373846998093907..e619b4c97585b6073933b4552a19758501ecff6a
--- 1/ext/date/php_date.c
--- 2/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -29,12 -29,7 +29,11 @@@
  #include "php_date.h"
  #include "zend_interfaces.h"
  #include "lib/timelib.h"
- #include "lib/timelib_private.h"
 +#ifndef PHP_WIN32
  #include <time.h>
 +#else
 +#include "win32/time.h"
 +#endif
  
  #ifdef PHP_WIN32
  static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }

diff --cc ext/date/tests/DateTimeZone_getLocation.phpt
Simple merge

diff --cc ext/intl/common/common_date.cpp
Simple merge

diff --cc ext/intl/timezone/timezone_class.cpp
Simple merge