Version code and changelog completion
Merge branch 'release' into upstream