Merge proposals

Jean-Christophe NOIR has no merge proposals.