Stash
Merge branch 'gentoo-rebase' into gentoo