Merge proposals

Stephane-champeau has no merge proposals.