Merge "Add documentation around zero-length timeouts"