Upgrade to PHP 5.4.13
Merge branch 'php-5.4.13'