Merge proposals

Stéphane Magnenat has no merge proposals.