Correct Version & Change Log
Merge branch 'Upstream_master' into Upstream_release
Merge branch 'Upstream_release' into Upstream_develop
Update develop to 1.4.0