Merge "Use time() instead of clock() for timeouts."