Fixed Bug #64578
Merge branch 'PHP-5.3' into PHP-5.4