Merged: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0cb7426796b2fb082f9176b7b08d08b21b5c86bb https://gitweb.gentoo.org/proj/portage.git/commit/?id=67fcbccd1b60b599e4e5dcc97f2959164ba6a7eb https://gitweb.gentoo.org/proj/portage.git/commit/?id=216297a9a7e91e48b74ef796b6642fd8c15085fc
-- Thanks, Zac
