Two patches for PHP 5.4
Merge branch 'mh_php54_sep9' into eschol_prod