Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.