fix failed test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix failed test
Fix patch for bug #67436
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_compile.c
Merge branch 'PHP-5.6'