[1.5.x] Updated six to 1.6.1.

Backport of 2ec82c7387db071278201796208808de84c90dbf from master