Merge "Add py37 tox env"