Suppress test failure with MySQL 5.7
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
new test, missing in ea466a3
Merge branch 'PHP-5.6'

* PHP-5.6:
  new test, missing in ea466a3
Fix another problem with MySQL 5.7
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Add support for gb18030/MySQL 5.7
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
add NEWS block for 5.6.0RC2
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS block for 5.6.0RC2
add missing entry to NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS
add missing entry to NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS
skip this test which fails without network
Merge branch 'PHP-5.6'

* PHP-5.6:
  skip this test which fails without network
Merge branch 'master' into phpng

* master:
  skip this test which fails without network
  add missing entry to NEWS
  add missing entry to NEWS
  add NEWS block for 5.6.0RC2
  Add support for gb18030/MySQL 5.7
  Fix another problem with MySQL 5.7
  new test, missing in ea466a3
  Suppress test failure with MySQL 5.7