Backported the patch from bug #67407 into 5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the patch from bug #67407 into 5.4
Backported the patch from bug #67407 into 5.5+