Helpful error codes on timeouts (bug 925332)
Merge pull request #336 from kumar303/timeouts

Helpful error codes on timeouts (bug 925332)