Add changelog and bump to 2.5 in preparation for release.
Added tag 2.5 for changeset 6ba869f2260f