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

# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #65322: compile time errors won't trigger auto loading
  5.4.20 release date
Fixed bug #61548
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #61548
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #61548

Conflicts:
	ext/standard/http_fopen_wrapper.c