doc/changelog.rst merge=union