Merge branch 'PHP-5.4'