Check on the angular-momentum argument in ZMP calculation
Merge branch 'master' into unstable