changelog for 64cee6e5c6eac32546febce6779fa77c06ac975a
merge 25cc296d64a50b875322e29ecd18350423ef41b7