Upgrade to six 1.4
Merge pull request #1400 from mdboom/misc/upgrade-six

Upgrade six to 1.4