Merge branch 'command-line-php-xdebug'