Added support for timing out non-async requests