Merge proposals

fonts-ipafont-nonfree in Ubuntu has no merge proposals.