Merge proposals

Sto1c has no merge proposals.