Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch
  updated libmagic.patch
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src

# By Anatol Belski
# Via Anatol Belski
* 'master' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  fix ZTS
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'master' of git.php.net:php-src
inject it directly. This is not C++ and I don't want to use hacks with similar structures
that are binary compatible. Better be explicit.
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src
Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

# By Pierre Joye (7) and others
# Via Pierre Joye (10) and others
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)
Merge branch 'master' of https://git.php.net/repository/php-src

# By Andrey Hristov (3) and Anatol Belski (1)
# Via Andrey Hristov (8) and others
* 'master' of https://git.php.net/repository/php-src:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.

Conflicts:
	ext/mysqlnd/mysqlnd_structs.h