Merge branch 'PHP-5.4' into PHP-5.5

Author: laruence

Zend/tests/bug64896.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
 --XFAIL--
-We can not fix this bug with a significant (performace slow down) change to gc
+We can not fix this bug without a significant (performace slow down) change to gc
 --FILE--
 <?php
 $bar = NULL;