Move farther in auto to deal with weaker shot
Merge branch 'stable' into develop