whitespace fixes.
Updated changelog for 2.6 release.