Giving PHP 5.3.3 one last chance
Synced from master
Synced from master