Merge branch 'releases/2.2.3'

2.2.3 readiness
Bump to next dev version

- 2.2.4dev
Merge branch 'version/bump'

2.2.4dev
[2.2.4] release readiness

- bump version
Merge branch 'releases/2.2.4'

2.2.4 readiness
Bump to next dev version

- 2.2.5dev
Merge branch 'releases/2.2.4' into develop

2.2.4 readiness

Conflicts:
	docs/languages/en/conf.py
Merge branch 'version/bump' into develop

Bump to dev version

Conflicts:
	docs/languages/en/conf.py