Merge pull request #10068 from gentoo-root/master