Merge pull request #729 from fabro-sh/fix/doctor-timeout-budget