Merge pull request #324 from dshrader/master

Update Changelog for 2.5 release.