Merge branch 'version/bump'

Bump version to 2.1.6dev
2.2.0rc2 readiness
Merge branch 'releases/2.2.0rc2'

2.2.0rc2 readiness
Merge branch 'releases/2.2.0rc2' into develop

2.2.0 readiness

Conflicts:
	docs/languages/en/conf.py
version bump

- 2.2.0dev
Merge branch 'version/bump' into develop

Back to dev

Conflicts:
	docs/languages/en/conf.py