Merge pull request #3170 from stratakis/py38