Initial run of python-modernize.
Type fidgeting.
Merge branch 'feature/2.2' into develop