Merge pull request #1220 in master
Merge branch 'develop'

Promote develop to master, making 2.3.0 next stable release.
[2.3.0] Bump version in docs configuration
Merge branch 'releases/2.3.0'

2.3.0 readiness
Merge branch 'releases/2.3.0' into develop

2.3.0 readiness

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

Bump to next maintenance dev release

Conflicts:
	docs/languages/en/conf.py