Unbreaks game timeouts

That could've been bad.
Merge branch 'team9dev' into last-additions
Gets rid of warning.