Update changelog to prepare for RC
Merge branch 'release' into upstream