Aimed at fixing https://github.com/HoneyryderChuck/httpx/issues/129 and https://github.com/HoneyryderChuck/httpx/issues/136