fix Alpine/Squaw for new season
Merge branch 'alpinesquaw'
Release 3.6.8