Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/gd/gd.c
index 462029cc8dc612a51109908273c8fe94a7484cf7,659c4143a8887a61108423b90574367a682a9a2f..e6ff62036b631418dbeca07c19fe903ac8dac787
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -1547,8 -1668,10 +1547,8 @@@ PHP_FUNCTION(imagetruecolortopalette
  }
  /* }}} */
  
- /* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted)
-    Convert a true colour image to a palette based image with a number of colours, optionally using dithering. */
 -
 -
+ /* {{{ proto void imagepalettetotruecolor(resource im)
+    Convert a palette based image to a true color image. */
  PHP_FUNCTION(imagepalettetotruecolor)
  {
        zval *IM;