Merge proposals

Cedric Durand has no merge proposals.