Merge "Change six to match global requirements"