Allow crypto_method context value in stream_socket_enable_crypto()
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/push/php-src:
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src:
  enable gmp for tests
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
updated NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
updated NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
put this test back to XFAIL, as it was before, since it is still leaking memory
separate travis jobs for TS and NTS builds
separate travis jobs for debug and non-debug builds
Fix bug #67060: use default mode of 660
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67060: use default mode of 660
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67060: use default mode of 660
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67060: use default mode of 660
Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5

* tyrael/more_travis:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

* origin/PHP-5.5:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

Conflicts:
	ext/mbstring/tests/zend_multibyte-08.phpt
Merge remote-tracking branch 'origin/PHP-5.6'

* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory