Merge proposals

defactum has no merge proposals.