version bump
Merge branch 'release-2.4'