CHANGES.rst merge=union
