Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge