Wind offset fix
Merge branch 'master' into tacking