Merge "Remove usage of six"