Imported Upstream version 5.4.35
Merge branch 'upstream-5.4' into master-5.4/squeeze
PHP 5.4.35 - Squeeze