Move changelog_master content into changelog_release
Merge branch 'release' into upstream