Upgrade to PHP 5.4.11
Merge branch 'php-5.4.11'