Change where timeout set for #10.
Merge branch 'master' into testflight