Sync with minor updates to 3_0 branch for Gentoo, etc.