Merge "Remove six.PY3/six.PY2"