Merged xdebug from 1.3.x