Checking in changes prior to tagging of version 2.6.

Changelog diff is: