CHANGELOG.rst merge=union
