Merged better-timeout-messages [r=lifeless,mwhudson] [f=617973]
When a TimeoutError is raised it now includes a description
explaining how the exception was triggered. This should help make
it easier to reason about timeout-related issues. Several
docstrings related to timeout tracing machinery have been added or
improved, as well.