Totally empty changelog_master on release
Merge branch 'release' into upstream