Merge proposals

vm303 has no merge proposals.