Merge proposals

libchamplain has no merge proposals.