Merge proposals

Kershaw-6 has no merge proposals.