Upstream merge dcbaf1ca6b43211ccf164064d57abd6e24057739. Full Gentoo build pass.