Imported Upstream version 5.4.36
Merge tag 'upstream/5.4.36' into master-5.4/wheezy

Upstream version 5.4.36
PHP 5.4.36 - Wheezy