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