Whitellama's changelog merge.

Preparation for merging #3177