Minor improvements (still strange hack)
Merge branch 'master' of https://github.com/yarda/gentoo-fedora
Merge branch 'master' of https://github.com/yarda/gentoo-fedora
Merge branch 'master' of https://github.com/yarda/gentoo-fedora