Better fix for bug #67072 with more BC provisions
Better fix for bug #67072 with more BC provisions
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #67072 with more BC provisions