Merge branch 'PHP-7.0'

diff --cc ext/gd/gd_compat.c
index af55e42d9a7c52e34d996778a7cbe248eb7165a4,aedc9b302accf4a5689da186e8c0a67cab4a12d1..79862bf75fecfee5d47ea124645022ef1b309490
--- 1/ext/gd/gd_compat.c
--- 2/ext/gd/gd_compat.c
+++ b/ext/gd/gd_compat.c
@@@ -1,4 -1,6 +1,8 @@@
 -#include "php_config.h"
 +#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #ifdef HAVE_CONFIG_H
  #include "config.h"
  #endif