Update from upstream at xrdebug/xrdebug
Update from upstream at xrdebug/xrdebug