Version code for change log
Merge branch 'release' into upstream