Merge branch 'master' into scalar_type_hints

Conflicts:
	Zend/zend.h
	Zend/zend_compile.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_operators.c
	Zend/zend_operators.h
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/tokenizer/tests/bug60097.phpt