Imported Upstream version 2.0.0
Merge tag 'upstream/2.0.0'

Upstream version 2.0.0