This will be PHP 5.3.28
Merge branch 'PHP-5.3' into PHP-5.4