Fixed build breakage from b4b4d9697f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed build breakage from b4b4d9697f