Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incorrect exception handling

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge