[1.7.x] Updated six to 1.6.1.

Backport of 2ec82c7387 from master