Merge proposals

fbtftp in Ubuntu has no merge proposals.