Changed default timeout from 0 to None