Merge proposals

cyrus-imspd in Ubuntu has no merge proposals.