add fix for  #60560 into upgrading
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix for  #60560 into upgrading
Merge branch 'PHP-5.5'

* PHP-5.5:
  add fix for  #60560 into upgrading