Merge branch 'master' of ../phpdbg into PHP-5.6