Merge branch 'releases/2.2.0'

2.2.0 readiness
Bump to 2.2.1dev
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py