Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_compile.c
Merge branch 'PHP-5.5'