Py3 compat requirements.
Modernize.
Merge branch 'feature/2.2' into develop