Adding line to CHANGELOG: * does this work right?
Merge branch 'feature/test-changelog-more'