Migrated to 3.17.1-r1 from gentoo-sources.
Reflect changes for v1.2.0.