Fix at_doubled handling
Merge branch 'master' into games