Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
Updated UPGRADING to cover PDO_pgsql changes
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated UPGRADING to cover PDO_pgsql changes
Fixed Bug #66890 imagescale segfault

zend_parse_parameters "l" expect long, not int
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault
NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
typo in NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo in NEWS
typo in NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  typo in NEWS
  typo in NEWS
Fix hash_pbkdf2() with missing $length argument

Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
Merge branch 'PHP-5.5' into PHP-5.6
Add SKIPIF in GMP test
Merge branch 'PHP-5.6'
Fixed Bug #66893i imagescale ignore method argument

We also have our goto fail; bug.

Upstream fix for libgd
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument
NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument