Merge tag 'upstream/602'

Upstream version 602
Imported Upstream version 602
updated changelog with new upstream release
Imported Upstream version 603
Merge tag 'upstream/603'

Upstream version 603
updated changelog for new upstream release