gauntlet fix
Merge branch 'master' into gauntlet_fix