Updated the bundled version of six to 1.4.0.
Replaced "not PY3" by "PY2", new in six 1.4.0.
Used six.moves.zip_longest, new in six 1.4.0.