Merge "Removal of tox envlist py3X"