Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

Conflicts:
	NEWS
	Zend/zend_compile.c

diff --cc Zend/zend_compile.c
index aa1df99ea959334dc731048701c697caca256604,766a2de01a3bc9a7720b5127113f7c4d97caef6b..6df3defb1e6dab4fc03d25783628da430a974dee
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -3829,10 -3632,10 +3829,10 @@@ static zend_bool zend_traits_method_com
  {
        zend_uint    fn_flags = fn->common.scope->ce_flags;
        zend_uint other_flags = other_fn->common.scope->ce_flags;
 -      
 +
        return zend_do_perform_implementation_check(fn, other_fn TSRMLS_CC)
-               && zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC)
+               && ((other_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) || zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC))
 -              && ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) == 
 +              && ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) ==
                    (other_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC))); /* equal final and static qualifier */
  }
  /* }}} */