Never time out after calling enableTimeouts(false)
"Merge pull request #1322 from Rob--W/enableTimeouts-suppress-timeout\n\nNever time out after calling enableTimeouts(false)"

* Rob--W/enableTimeouts-suppress-timeout:
  Never time out after calling enableTimeouts(false)