Also fixed bug #64726 in 5.3
Merge branch 'PHP-5.3' into PHP-5.4