Fix typos in simplex constraint def
Merge branch 'master' into shake-and-bake