Merge branch 'gentoo_support_for_review' into my_master