Merge proposals

Damien Zufferey has no merge proposals.