Merge xdebug 1.3.x