latest merge fixes
Merge branch 'master' of git.funtoo.org:funtoo-overlay