Moves are way too short to make tones, if in mm mode
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6