Partial fix for bug #64239
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #64239
Merge branch 'PHP-5.5'

* PHP-5.5:
  Partial fix for bug #64239