Fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix merge