Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge