Merge branch 'hotfix/1130'

Close #1130
[2.2.5] updated release version
Merge branch 'releases/2.2.5'

2.2.5 readiness
Merge branch 'releases/2.2.5' into develop

2.2.5 readiness

Conflicts:
	docs/languages/en/conf.py
Bump to next dev version

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

Bump to next dev version

Conflicts:
	docs/languages/en/conf.py