Ensure timeout works correctly #1032
Merge branch 'master' into 2.0-dev