Relax default timeouts a bit
Merge pull request #684 from dswd/relax_timeouts

Relax default timeouts a bit