Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

Conflicts:
	NEWS

diff --cc NEWS
index cec955c5729489616669987ce528323e88417074,a9ddf575d5fce0aa6c03a3cba5d115c632514666..3708a7356152b8a3af9b8039d91b9296f9991271
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -34,7 -31,10 +34,10 @@@
    . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
      has rounding errors) (Keyur Govande)
  
 -22 Jan 2015, PHP 5.5.21
+ - Streams:
+   . Fixed bug which caused call after final close on streams filter. (Bob)
+ 
 +22 Jan 2015, PHP 5.6.5
  
  - Core:
    . Upgraded crypt_blowfish to version 1.3. (Leigh)