Merge branch 'master' into refactoring2

Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c

diff --cc Zend/zend.c
Simple merge

diff --cc ext/curl/interface.c
Simple merge

diff --cc ext/date/php_date.c
index 439621f5e515b5876f636e62cb24285d51ccf708,f81f87e4c91069857236f8ec242ae681d6af369e..31cb41adfdfd3c8355ccae6ff86d79e6410ed3c1
--- 1/ext/date/php_date.c
--- 2/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2680,7 -2729,9 +2680,9 @@@ PHP_METHOD(DateTime, __construct
  
        zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) {
-               php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);
 -              if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) {
 -                      ZVAL_NULL(getThis());
++              if (!php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) {
++//???                 ZVAL_NULL(getThis());
+               }
        }
        zend_restore_error_handling(&error_handling TSRMLS_CC);
  }

diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge

diff --cc ext/pdo_firebird/firebird_driver.c
Simple merge

diff --cc ext/standard/html.c
Simple merge