Upgrade to PHP 5.4.16
Merge branch 'php-5.4.16'