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