Improved the fix for bug #67072, thanks Nikita
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improved the fix for bug #67072, thanks Nikita
refixed the test related to bug #67072
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita