Merge pull request #724 from zaibon/fix/doctor-health-timeout