from now on, this should be 5.6.1-dev
almost forgot to bump this
Merge branch 'PHP-5.6'

* PHP-5.6:
  almost forgot to bump this
  from now on, this should be 5.6.1-dev