Whitellama's changelog merge.