[1.7.x] Updated six to 1.8.0.

Backport of 81477c91f6 from master