Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove mentions of "type hint" and "typehint"

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_inheritance.c
Simple merge