Totally untested updates for PHP54 and xdebug