Merge proposals

STARMAC has no merge proposals.