Merge proposals

Francesco Fumanti has no merge proposals.