Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt

diff --cc ext/gd/tests/gd_info_variation1.phpt
index 1810a82f8562b44df2a17e1d263acf4bd2de1658,fffde0ba249368abb7bfd87357ec2cbc26419505..3b4669561f39ab47266f9ca86d020cfb49535bcb
--- 1/ext/gd/tests/gd_info_variation1.phpt
--- 2/ext/gd/tests/gd_info_variation1.phpt
+++ b/ext/gd/tests/gd_info_variation1.phpt
@@@ -25,24 -25,28 +25,26 @@@ var_dump(gd_info())
  *** Testing gd_info() : variation ***
  array(%d) {
    ["GD Version"]=>
-   string(%d) %a
+   string(%d) %s
    ["FreeType Support"]=>
-   bool%a
+   bool(%s)
 -  ["T1Lib Support"]=>
 -  bool(%s)
    ["GIF Read Support"]=>
-   bool%a
+   bool(%s)
    ["GIF Create Support"]=>
-   bool%a
+   bool(%s)
    ["JPEG Support"]=>
-   bool%a
+   bool(%s)
    ["PNG Support"]=>
-   bool%a
+   bool(%s)
    ["WBMP Support"]=>
-   bool%a
+   bool(%s)
    ["XPM Support"]=>
-   bool%a
+   bool(%s)
    ["XBM Support"]=>
-   bool%a
+   bool(%s)
+   ["WebP Support"]=>
+   bool(%s)
    ["JIS-mapped Japanese Font Support"]=>
-   bool%a
+   bool(%s)
  }
 -===DONE===
 +===DONE===