Update timeout time to new default value.
Merge remote-tracking branch 'upstream/master'