Use union merge for changelog
Merge pull request #3211 from astrofrog/changelog-union

Use union merge for changelog