Merge branch 'hotfix/#902'

Close #902
Updating to 2.2.1 for release
Merge branch 'releases/2.2.1'

2.2.1 readiness
Version bump

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

Update from latest master

Conflicts:
	docs/languages/en/conf.py