Stupid xyz
Merge branch 'manipulation' into zmpwalking