Fix #1643 - Upgrade six to 1.6.1
Merge pull request #1691 from dstufft/upgrade-six

Fix #1643 - Upgrade six to 1.6.1