Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage into public_api