Merge proposals

cowbell in Ubuntu has no merge proposals.