rebase on current master.

Author: beberlei

Zend/zend_attributes.c

@@ -425,7 +425,7 @@ zend_ce_override = register_class_Override();
 zend_mark_internal_attribute(zend_ce_override);
 
 zend_ce_deprecated_attribute = register_class_Deprecated();
-attr = zend_mark_internal_attribiute(zend_ce_deprecated_properties);
+attr = zend_mark_internal_attribute(zend_ce_deprecated_attribute);
 attr->validator = validate_deprecated_attribute;
 }