Squash changelog entries for old pre-releases.
Merge branch 'squash_changelog' into 2.5-testing