Checking in changes prior to tagging of version 2.5.

Changelog diff is: