Imported Upstream version 2.0.2
Merge tag 'upstream/2.0.2'

Upstream version 2.0.2