Fix bug #68188
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_object_handlers.c