Merge "Remove python-six dependency"