Upgrade to latest six.