/CHANGELOG.rst merge=union