Merge proposals

i486 has no merge proposals.