Updated changelog in some-topic-branch

This branch cannot be merged. This is a pain in the ass.