Commit from shangyi
Merge branch 'master' of github.com:MOD-ASL/gaits_and_configs