Merge proposals

Damien Durand has no merge proposals.