The timeout is in seconds.
Merge pull request #1923 from Lukasa/master

The timeout is in seconds.