5.5.8-dev now
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.5.8-dev now