resolves #1300: passing 0 to timeout() will disable timeouts
Merge pull request #1301 from boneskull/master

resolves #1300: passing 0 to timeout() will disable timeouts