Merge branch 'release-2.2.3'
Bumps version number.
Updates pot file.
Updates changelog
Merge branch 'release-2.3'
Merge branch 'master' into release-2.3
Merge branch 'release-2.3' into develop