Merge proposals

GNU/kFreeBSD Maintainers has no merge proposals.