Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h

Author: pierrejoye