Merge proposals

ifrit in Ubuntu has no merge proposals.