Fix for php bug #64802 includes test case
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c