This will PHP 5.3.25
Merge branch 'PHP-5.3' into PHP-5.4