Merge branch 'portage-prefix' into portage-prefix-autotooled