Correct Version & Change Log
Merge branch 'Upstream_master' into Upstream_release