Checking in changes prior to tagging of version n.

Changelog diff is: