Merge branch 'master' of https://github.com/kkedacic/gentoo