Merge proposals

proftpd-dfsg in Ubuntu has no merge proposals.