Merge branch 'commit-to-changelog'