docs/changelog.txt merge=union