Merge pull request #8937 from ctiller/xxx

Increase timeout to make this pass reliably on Windows