Merge proposals

Eric-Olivier Lamey has no merge proposals.